Repository navigation
Rebase Renovate PRs when main moves, and record the required checks - #208
Conversation
Set rebaseWhen to behind-base-branch. With automerge off and the ruleset's strict policy off, Renovate's default only rebased conflicted PRs, so #205 sat 3 commits behind main for more than 2.5 hours on 2026-11-02. The cost is one extra CI run per open bot PR after each merge, with at most 3 open. Also fix the automerge note. It said ProtectMain had no status-check rule (checked 2026-10-21). It now requires "Build front-end" and "Rust port" and a pull request, with the strict policy off and the Admin role as a bypass actor. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01Kd6o1asZ1umbDC4dVgANYJ
|
No actionable comments were generated in the recent review.
|
| Layer / File(s) | Summary |
|---|---|
Document ruleset settings and set rebase condition .github/renovate.json5 |
The comments describe required CI checks, disabled strict status-check enforcement, and admin bypass. Renovate now rebases when a branch falls behind the base branch. |
Estimated code review effort: 2 (Simple) | ~10 minutes
Change: Bug fix
Possibly related issues
- FactoryGameFan/FactorioTools issue 41 tracks Renovate-created pull requests and provides a rebase action. The new rebase condition addresses the documented stale-branch behavior.
Merge Risk: 
Minimal · up to e22e8
-
The Renovate configuration change is ready to merge.
Pre-merge checks: 
5
-
Full details: Docstring Coverage
-
Explanation
No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 0 files. (1 skipped: 1 unsupported.)
-
Finishing Touches
-
Generate unit tests (beta)
-
- Commit to this branch
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
What changed
Two changes to (
.github/renovate.json5):rebaseWhen: "behind-base-branch". Renovate now rebases a bot PR whenmainmoves, not only when it conflicts.Why
auto) only rebases behind-base PRs when automerge is on or the ruleset needs an up-to-date branch. Here automerge is off and the ruleset's strict policy is off. So chore(deps): update lint and format tooling #205 sat 3 commits behindmainfor more than 2.5 hours on 2026-11-02, with checks that ran against an old base. The cost is one extra CI run per open bot PR after each merge. At most 3 are open at once (prConcurrentLimitin the org preset).gh api repos/FactoryGameFan/FactorioTools/rulesets/18139941on 2026-11-02 shows ProtectMain now requires a pull request and both ci.yml checks, "Build front-end" and "Rust port". The strict policy is off, and the Admin role can bypass the rules. The note now says so. Of the three automerge conditions it lists, only "checks required" holds today.How it was tested
renovate-config-validator --strict --no-global(renovate 44.199.0):Config validated successfully against 1 file(s).workers/repository/update/branch/reuse.js) to confirm thatautofalls back toconflictedwhen automerge is off and the branch rules do not require an up-to-date branch.🤖 Generated with Claude Code
https://claude.ai/code/session_01Kd6o1asZ1umbDC4dVgANYJ
Summary by CodeRabbit